Don't use _gdk_pixbuf_load_module_unlocked() in the !USE_GMODULE case.

2004-11-12  Matthias Clasen  <mclasen@redhat.com>

	* gdk-pixbuf-io.c (gdk_pixbuf_io_init): Don't use
	_gdk_pixbuf_load_module_unlocked() in the !USE_GMODULE case.

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 02aa46380c9f39a7d2fc96c7045305f049975509..eed61bde44ae0fbfec75f29330d4994c997a78e2 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,5 +1,8 @@
 2004-11-12  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk-pixbuf-io.c (gdk_pixbuf_io_init): Don't use 
+       _gdk_pixbuf_load_module_unlocked() in the !USE_GMODULE case.
+
        * === Released 2.5.5 ===
        
 2004-11-12  Matthias Clasen  <mclasen@redhat.com>

diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 9ad408748e5c55c650317ccac99571cbad8d9f17..5c2157e3eab6df5f278d9eee63faefa59a32e325 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -243,7 +243,7 @@ correct_prefix (gchar **path)
     }
 }
 
-#endif
+#endif  /* G_OS_WIN32 */
 
 static gchar *
 gdk_pixbuf_get_module_file (void)
@@ -424,7 +424,7 @@ _gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module,
        char *path;
        GModule *module;
        gpointer sym;
-       
+               
         g_return_val_if_fail (image_module->module == NULL, FALSE);
 
        path = image_module->module_path;
@@ -464,10 +464,10 @@ _gdk_pixbuf_load_module (GdkPixbufModule *image_module,
        G_LOCK (init_lock);
        ret = _gdk_pixbuf_load_module_unlocked (image_module, error);
        G_UNLOCK (init_lock);
-
        return ret;
 }
-#else
+
+#else  /* !USE_GMODULE */
 
 #define module(type) \
   extern void MODULE_ENTRY (type, fill_info)   (GdkPixbufFormat *info);   \
@@ -631,14 +631,14 @@ gdk_pixbuf_io_init ()
        for (name = included_formats; *name; name++) {
                module = g_new0 (GdkPixbufModule, 1);
                module->module_name = *name;
-               if (_gdk_pixbuf_load_module_unlocked (module, NULL))
+               if (_gdk_pixbuf_load_module (module, NULL))
                        file_formats = g_slist_prepend (file_formats, module);
                else
                        g_free (module);
        }
 }
 
-#endif
+#endif  /* !USE_GMODULE */
 
 \f